From d3c00a1d4a4a74bd5f47d4bc8488f7d88afc7c5b Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 30 Mar 2009 05:38:51 +0000 Subject: [PATCH] Fix previous change. Define ftfont_variation_glyphs even if HAVE_M17N_FLT is not defined. --- src/ftfont.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ftfont.c b/src/ftfont.c index 33fb9b455a6..aa9777acf34 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -382,14 +382,10 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int, static Lisp_Object ftfont_otf_capability P_ ((struct font *)); static Lisp_Object ftfont_shape P_ ((Lisp_Object)); -#ifdef HAVE_LIBOTF -#ifdef HAVE_M17N_FLT #ifdef HAVE_OTF_GET_VARIATION_GLYPHS static int ftfont_variation_glyphs P_ ((struct font *, int c, unsigned variations[256])); #endif /* HAVE_OTF_GET_VARIATION_GLYPHS */ -#endif /* HAVE_M17N_FLT */ -#endif /* HAVE_LIBOTF */ struct font_driver ftfont_driver = { @@ -430,7 +426,7 @@ struct font_driver ftfont_driver = #endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */ NULL, /* check */ -#if defined (HAVE_LIBOTF) && defined (HAVE_M17N_FLT) && defined (HAVE_OTF_GET_VARIATION_GLYPHS) +#ifdef HAVE_OTF_GET_VARIATION_GLYPHS ftfont_variation_glyphs #else NULL @@ -2023,6 +2019,8 @@ ftfont_shape (lgstring) return ftfont_shape_by_flt (lgstring, font, ftfont_info->ft_size->face, otf); } +#endif /* HAVE_M17N_FLT */ + #ifdef HAVE_OTF_GET_VARIATION_GLYPHS static int @@ -2040,7 +2038,6 @@ ftfont_variation_glyphs (font, c, variations) } #endif /* HAVE_OTF_GET_VARIATION_GLYPHS */ -#endif /* HAVE_M17N_FLT */ #endif /* HAVE_LIBOTF */ Lisp_Object -- 2.30.2